From: Marco Trevisan (Treviño) <mail@3v1n0.net>
Date: Wed, 2 Oct 2019 19:56:05 +0000 (+0200)
Subject: shell-global: Ignore modal operations if we have no compositor
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~811^2^2~4
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=31fe517007c4b5e6cb4497c5537a5e7ba6b7ccfb;p=gnome-shell.git

shell-global: Ignore modal operations if we have no compositor

Modal dialog actions might be triggered during display closing, and in such
cases we should just ignore the requests.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/746
---

diff --git a/src/shell-global.c b/src/shell-global.c
index 7f74a34fd..77e167c10 100644
--- a/src/shell-global.c
+++ b/src/shell-global.c
@@ -943,6 +943,9 @@ shell_global_begin_modal (ShellGlobal       *global,
                           guint32           timestamp,
                           MetaModalOptions  options)
 {
+  if (!meta_display_get_compositor (global->meta_display))
+    return FALSE;
+
   /* Make it an error to call begin_modal while we already
    * have a modal active. */
   if (global->has_modal)
@@ -964,6 +967,9 @@ void
 shell_global_end_modal (ShellGlobal *global,
                         guint32      timestamp)
 {
+  if (!meta_display_get_compositor (global->meta_display))
+    return;
+
   if (!global->has_modal)
     return;